Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Fri, 26 Feb 2016 23:08:43 +0000 (18:08 -0500)
committerTom Rini <[email protected]>
Fri, 26 Feb 2016 23:08:43 +0000 (18:08 -0500)

Trivial merge